From: Robert Lipe <robertlipe@gpsbabel.org>
Date: Mon, 28 Dec 2015 03:23:19 +0000 (-0600)
Subject: Speculative changes for future OS versions in reporting.
X-Git-Tag: archive/raspbian/1.10.0+ds-2+rpi1~1^2~12^2~10^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=58ae2f4b59e653039a1dfba489d1ac241658589d;p=gpsbabel.git

Speculative changes for future OS versions in reporting.
---

diff --git a/gui/upgrade.cc b/gui/upgrade.cc
index 9dc5f727f..93d26695a 100644
--- a/gui/upgrade.cc
+++ b/gui/upgrade.cc
@@ -103,16 +103,14 @@ QString UpgradeCheck::getOsVersion()
   case QSysInfo::MV_10_3: return "10.3"; break;
   case QSysInfo::MV_10_4: return "10.4"; break;
   case QSysInfo::MV_10_5: return "10.5"; break;
-  case QSysInfo::MV_10_6: return "10.6"; break;
-  case QSysInfo::MV_10_7: return "10.7"; break;
-  case QSysInfo::MV_10_8: return "10.8"; break;
-  case QSysInfo::MV_10_9: return "10.9"; break;
+  case QSysInfo::MV_10_6: return "10.6"; break;  // Snow Leopard.
+  case QSysInfo::MV_10_7: return "10.7"; break;  // Lion.
+  case QSysInfo::MV_10_8: return "10.8"; break;  // Mountain Lion
+  case QSysInfo::MV_10_9: return "10.9"; break;  // Mavericks
+  case QSysInfo::MV_10_10: return "10.10"; break;  // Yosemite
   default:
-    if (QSysInfo::MacintoshVersion == 10) {
-      return "10.10";
-      break;
-    }
-    if (QSysInfo::MacintoshVersion == 11) {
+    // This probably doesn't work...
+    if (QSysInfo::MacintoshVersion == 0x000D) {
       return "10.11";
       break;
     }
@@ -135,6 +133,7 @@ QString UpgradeCheck::getOsVersion()
   default:
        if (QSysInfo::WindowsVersion == 0x00a0) return "8";
        if (QSysInfo::WindowsVersion == 0x00b0) return "8.1";
+       if (QSysInfo::WindowsVersion == 0x00c0) return "10.0";
       return "Windows/Unknown";
   }
 #endif